From 4cf7fe5832821a2d881143c76803cc56d14adb19 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Mon, 5 Jan 2009 20:35:25 +0100 Subject: [PATCH] Add more toplevel window checks --- gdk/quartz/gdkwindow-quartz.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 75de4aa6f9..494cea7e2a 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -2099,10 +2099,10 @@ gdk_window_set_title (GdkWindow *window, { GdkWindowImplQuartz *impl; - g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (title != NULL); - if (GDK_WINDOW_DESTROYED (window)) + if (GDK_WINDOW_DESTROYED (window) || + WINDOW_IS_TOPLEVEL (window)) return; impl = GDK_WINDOW_IMPL_QUARTZ (((GdkWindowObject *)window)->impl); @@ -2119,6 +2119,10 @@ void gdk_window_set_role (GdkWindow *window, const gchar *role) { + if (GDK_WINDOW_DESTROYED (window) || + WINDOW_IS_TOPLEVEL (window)) + return; + /* FIXME: Implement */ } @@ -2129,8 +2133,8 @@ gdk_window_set_transient_for (GdkWindow *window, GdkWindowImplQuartz *window_impl; GdkWindowImplQuartz *parent_impl; - if (GDK_WINDOW_DESTROYED (window) || GDK_WINDOW_DESTROYED (parent)) - return; + if (!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (parent) && + WINDOW_IS_TOPLEVEL (window)) window_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); if (!window_impl->toplevel) -- 2.30.2